Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into...

Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-mainline-prod am: 10b5ab82 am: ae20f0e5 am: 06c8e247 am: b55b5a4d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857



Change-Id: I529e6c4202ede26aa3a0b6ac7b62ba2c8db22424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>