[automerger skipped] Merge changes I93d4d089,I4f09f9e5 into tm-qpr-dev am:...

[automerger skipped] Merge changes I93d4d089,I4f09f9e5 into tm-qpr-dev am: f5a97660 am: 06edef48 -s ours

am skip reason: Merged-In I93d4d089f537515d452c1330f5d75a6726b229f8 with SHA-1 aabea168 is already in history

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



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