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

Change-Id: Id0409b03b6e82ca9feff10c8c4bab94b2d119254