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

Merge changes from topic "am-c036cb8107fa4697ae97e16bc8c57a94" into tm-d1-dev-plus-aosp am: 355cf553

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



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