Merge "Merge "Allow mutable overlays to be enabled by default" into rvc-dev am: 21466392 am: 5ad78b9c am: cfe6553a" into rvc-qpr-dev-plus-aosp