Merge "[automerger skipped] Introduce build variable...

Merge "[automerger skipped] Introduce build variable `OVERRIDE_TARGET_FLATTEN_APEX`. am: 1dbb0c3d -s ours am: 7f81fd14 -s ours am: b15e284a -s ours am: f48e65a6 -s ours" into rvc-qpr-dev-plus-aosp am: 8d23c748 -s ours

am skip reason: Change-Id Ib9ccae38430340de38e4758b4f55df2c65ea60d5 with SHA-1 1dbb0c3d is in history

Change-Id: I90348668ff816afb7b783110e48c3b9473a9d3d9