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

Change-Id: I8badb5847fe3272168f252e2f3ba75b20a7a5b2e