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