Merge "[automerger skipped] Fix _ImportParser() error if property is imported...

Merge "[automerger skipped] Fix _ImportParser() error if property is imported from oem partition. am: 96c88287 am: 3065c1b1 am: cfd7302f -s ours" into rvc-qpr-dev-plus-aosp am: 48306db0 -s ours

am skip reason: Change-Id I47875bf7a698390e11690150e6516a3064550ca0 with SHA-1 96c88287 is in history

Change-Id: I93f5bb9ac34bf9a4425c713e55b9937ae1d00a41