Merge "[automerger skipped] cleanup - remove config.c am: 2d35cdbd89 am: 5c4c4ec621 am: d2cff34d9f -s ours" into rvc-qpr-dev-plus-aosp