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

Change-Id: I3d2e9f42f46172b249f99924325f6a3cab1fa4d9