Merge "Merge "Fix config change on secondary split adjustment" into rvc-dev am: 320ecaca am: 07c8e53b" into rvc-d1-dev-plus-aosp