Merge "Merge "Fix extra configuration change when unlocking directly" into rvc-dev am: 54e3542b am: a35ab288 am: d1bc73da" into rvc-qpr-dev-plus-aosp