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

Change-Id: I3ce90b718f486f3f3d21706b369019b72df4038a