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

Change-Id: I80658c4a42ea1144149856766e357b4e5b06ef94