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