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

Change-Id: I583b4a597fcf44f2ff22c09591b0e54f4a762042