[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
am: 50b3c69c9e -s ours
am skip reason: subject contains skip directive

Change-Id: Ib3886dbda15f5e04f72a423be9ed78f88fbc4588