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