Merge "Merge "Fix extra configuration change when unlocking directly" into rvc-dev am: 54e3542b96 am: a35ab2884a am: d1bc73daff" into rvc-qpr-dev-plus-aosp