Merge changes from topic "am-0e4ff05ba9ce4e1494489f29f1a9e967" into...

Merge changes from topic "am-0e4ff05ba9ce4e1494489f29f1a9e967" into tm-d1-dev-plus-aosp am: fd82bd85

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



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