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

Change-Id: I2434378df0665578e3dc5ff1571e73bcaf952f4b