Merge changes from topic "am-7239d99af3b94ed6b17b0eb5e4bbdb3c" into...

Merge changes from topic "am-7239d99af3b94ed6b17b0eb5e4bbdb3c" into tm-d1-dev-plus-aosp am: 70d0cae4

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



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