[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: c86ffbb4c0
am: c2505ea799 -s ours
am skip reason: subject contains skip directive

Change-Id: I1c78a90be7507dd6688f96784e1bd43758cb611e