Merge changes from topics "presubmit-am-7e93fea7eeca4c76a2b33d5fe115ad40",...

Merge changes from topics "presubmit-am-7e93fea7eeca4c76a2b33d5fe115ad40", "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-dev" into sc-dev am: ca436b7e

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



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