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

Change-Id: I7a0192da8e33c05acfd9a0c88e6b81868bd1333b