[automerger skipped] Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master" into stage-aosp-master
am: ee73a97b41 -s ours
am skip reason: subject contains skip directive

Change-Id: Id4c9a62720944f51c8c8c2f62cecb8df33f95a07