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