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