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