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

Change-Id: I85a43bcdc37936cb19756b6927c1d3d6ccc39654