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