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

Change-Id: Ic64ce3749dae575c3d8763310987705fa90371c9