[automerger skipped] Merge "[DO NOT MERGE] Handle config override via settings correctly am: dc0f443cb6 am: ac21b9edd4" into qt-r1-dev-plus-aosp
am: 865a792493 -s ours
am skip reason: subject contains skip directive

Change-Id: Id8d5ff7be1758ad48973b8f2c522c97d9b14d404