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

Change-Id: I0c31b239cbac9db07f3c97fc6d516db808413af1