[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
am: bbad9292b7  -s ours

Change-Id: I6afc050334413bfd5e7f33c2e45f1dfd0d91c55b