[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: 10fe30c6a1 -s ours
am: 2811ee6ff9

Change-Id: I2d415ea6dee703b61bcd726709478bb7ff106d27