Merge changes from topic "presubmit-am-7558807516104e4aa3755256c45095b4" into...

Merge changes from topic "presubmit-am-7558807516104e4aa3755256c45095b4" into sc-v2-dev-plus-aosp am: 8ff1ef33 am: 6f94d1f7

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



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