Android mainline 11.0.0 release 18
[automerger skipped] Add product partition file support am: 9feca325c6 -s ours am: 3cdb8d085f -s ours

am skip reason: Change-Id I2e86176285b888a923cb44278767af9f16710635 with SHA-1 8e95629656 is in history

Change-Id: I50fe07215f991a0f09d02cac3f270e4eac79588c