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