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

Change-Id: I623e9ba0dd32790623592421f4ddd5fd8c8836fe