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

Change-Id: I3d4ba42bbb9af3669eec8ccb63d155358e6152ff