[automerger skipped] Merge "Merge "Revert "Revert "Fix InstallOverlayTests...

[automerger skipped] Merge "Merge "Revert "Revert "Fix InstallOverlayTests fail to install overlay""" into rvc-dev-plus-aosp am: 05470139" into rvc-d1-dev-plus-aosp am: d9494cc7 am: d0243bb0 -s ours

am skip reason: Change-Id I364cf9c8b65dafb2954c1908aa8a2f00ff4ef229 with SHA-1 753e5a93 is in history

Change-Id: I00f96bf8456961fbbd7c5bd116ccfa2337bb3adf