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

Change-Id: Ib8d3bd269e814f2200a3584460ca7a377e791e72