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

Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: b54c768b -s ours

am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876 is already in history

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



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