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

Change-Id: I8027c696ed770d8ae5502c99dd64c4583cefcae2