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

Change-Id: I285fd54e94652c7113340e9b75d96c830cbbf21b