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

Change-Id: Ifba9dbd005b9bfdb96dcf5f1e17bc03861feebc4