Merge changes from topic "presubmit-am-36bba661a52b4792a8d74b3037c240af" into...

Merge changes from topic "presubmit-am-36bba661a52b4792a8d74b3037c240af" into sc-mainline-prod am: ff36a387 am: 8ebd0c13 am: d8891c66

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



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