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