Merge changes from topic "am-34bf4ac7f49d41048fc87ed16f762c0a" into...

Merge changes from topic "am-34bf4ac7f49d41048fc87ed16f762c0a" into tm-d1-dev-plus-aosp am: a5c64e1c

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



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