Merge "Revert "Fix InstallOverlayTests fail to install overlay"" into rvc-dev-plus-aosp