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

Change-Id: I1f566f14f83b5634ae0bd5e6d951707774bb80d1