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

Change-Id: I81cc3ccd14b0c2f7e6f53482f60ae70a9f89fedb