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

Change-Id: Ia6a082321b076b6ad6aa05f00a375ada9874b0c1