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