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

Change-Id: I6df5c34b02a0348885a3d9fca0b5e18b6ee0a2b9