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