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

Change-Id: I6007972eb71e1ae78cfefb74c822344e58fa861f