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

Change-Id: Icfacdb6066b6f3fdc8c63e33a87983d961132df0