Merge changes from topic "am-2a6d18c09fae48e594f3db99e049d130" into...

Merge changes from topic "am-2a6d18c09fae48e594f3db99e049d130" into tm-d1-dev-plus-aosp am: 7a395263 am: 6b24baab

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



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