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

Change-Id: I4e27992c0f18b08333e7fd76a76a8421875fe698