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

Change-Id: Iee868ee1fb95c8738a2df45098581eda3ea250ec