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

Change-Id: Ifad809bf2c6fb10cab580b2be7b81305ac5c06fb