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