[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: 50b3c69c9e -s ours
am: 04605340e2

Change-Id: Iccd5e06250715a0ee8b78255d6e90955137ffa62