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

Change-Id: I27cbe618b6bcb32b76f4d900be7be10f6c7cc613