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

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

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



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