[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master am: 0e0787f4d0 -s ours am: b5e975633f
am: 922e7d4f42 -s ours
am skip reason: subject contains skip directive

Change-Id: I05fb8718cb566a62f83415297c673d812db2667d