[automerger skipped] Merge "Merge "[DO NOT MERGE] Handle config override via...

[automerger skipped] Merge "Merge "[DO NOT MERGE] Handle config override via settings correctly" into qt-dev am: 526ab77a am: 1251085a" into qt-r1-dev-plus-aosp
am: 787701b8 -s ours
am skip reason: subject contains skip directive

Change-Id: I5474c581d1b45093193c75d3b9edf0b442e0685e