Merge changes from topic "am-b26f2cb44c53490f868637cd5d96ec61" into...

Merge changes from topic "am-b26f2cb44c53490f868637cd5d96ec61" into tm-d1-dev-plus-aosp am: 9c9743a4

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



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