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