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