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

Change-Id: I77cf44323f78645d7aa3ed9776bea7a67a138dac