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