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

Change-Id: Ic92db80ff294780dc47598aa2f4c6bf63d40a022