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