[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: a9e018f52d -s ours am: 7c6bb3d242
am: 4ab5b60c89 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic3f5920166d9421fde12377789c4ef2600bda620