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

Change-Id: Ifb642fe1ccce8754a3e6df9d7e5df26dc291405c