[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: fef0cab5e9 -s ours
am: 84086a4b24

Change-Id: I44f9d36f081100463f5e86083656762b65d74055