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

Change-Id: I4699f0457f148992e17368bb0727536245de098b