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

Change-Id: I8648516039aef80457e41d43e6ea9bb64814b0e9