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

Merge changes from topic "am-fccad1fd78d74820ac27310bf754500a" into tm-d1-dev-plus-aosp am: 474e99c3 am: f4235357

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



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