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

Change-Id: Ifaed9176bfab9210cc0bd19129a9caffed0769b5