[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: 4d18e943e9 -s ours am: 610ed9b004
am: 895dedd877 -s ours
am skip reason: subject contains skip directive

Change-Id: If8d1ae172e252a28534aaa102c56e2798f9aeaeb