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

Change-Id: Id4a40af1767ae676b16fed8adad901a6c11b13dd