[automerger skipped] Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master" into stage-aosp-master am: ee73a97b41 -s ours
am: a17910692c

Change-Id: I2e7b779d7074ab53531c6982ffc7af89d23b16fd