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

Change-Id: Ic4b0ba52fe07d8b19584fc89b9d81985f375a0ab