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

Change-Id: I94b14e5c425ba4fac9d3e380e9a645b1ae650342