Merge "[automerger skipped] Merge changes from topic "security_fix_settings"...

Merge "[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 09e25567 -s ours am: 14302b3a -s ours am: 3e1ae794 -s ours am: 64d4433a -s ours am: acac31e7 -s ours am: b1e65ea2 -s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d932857 is in history" into qt-r1-dev-plus-aosp