Merge "[DO NOT MERGE] Handle config override via settings correctly am: dc0f443cb6 am: ac21b9edd4" into qt-r1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
865a792493