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