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

Change-Id: I2fdd7f4c0dc4c521ff58d6a9aeccbf548aed7461