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