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

Change-Id: Ibea2c3c90287b1c48393bb8c2aa65bf111d2f332