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

Change-Id: I9f565a86ee4bf663f18e940fc33e571da123a240