Merge "Merge "Modify docs to reflect operational changes in overrideConfig" am: 2d5af940ae am: 032fb54fae" into qt-dev-plus-aosp