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

Change-Id: I273109812aadab9e81f81adf6d78913061356c7f