[automerger skipped] Merge "Merge "Remove unused setting" into qt-r1-dev am: 95a675ce91 am: 709b0a4a74" into qt-qpr1-dev-plus-aosp
am:2300a4ec62-s ours am skip reason: change_id I5c4af200b0c61efb9a0f76d00c2f047d4880d77b with SHA1d806bc4c11is in history Change-Id: I60b01b00ac68a888d8dca0a76b97b1ce59bde5df
This commit is contained in: