[automerger skipped] Merge "Merge "Support multiple requiredSystemProperty in...

[automerger skipped] Merge "Merge "Support multiple requiredSystemProperty in overlay" into rvc-dev am: ce0f9f76 am: d960849c am: e5d642c3" into rvc-qpr-dev-plus-aosp am: ea076f68 -s ours

am skip reason: Change-Id I4c8c4a1304dc52d6568767d90e3dcbf6acef024a with SHA-1 5e6a8701 is in history

Change-Id: Iadee6a13fc9ee75cad3c12559ff9c3fc8d76052e