[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT...

[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 94c83532 am: e7038aa1 -s ours am: 657e0f30 -s ours am: 379ae6c7 -s ours

am skip reason: Change-Id Ifa4dc400eb8c87c2514a3629288657520476fbfd with SHA-1 ccc40638 is in history

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

Change-Id: Ia188911bc5dffe63a0dc7a576314efecb1b5ba05