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 -s ours am: bd8bcb4d -s ours am: 8595f570 -s ours" into rvc-qpr-dev-plus-aosp am: e1b29437 -s ours

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

Change-Id: Idab2991c00ad14100358e001f33409760bcf07bc