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