[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: c43581ec92 -s ours
am: 5b9432d091

Change-Id: Ifdea2c27276db543a279c7df97d332a9f21fa3bc