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