Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18578961 Change-Id: I8d5d06a6600ac730f1d1f9e440f70181e2262b6d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>