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

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

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



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