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

Change-Id: If4d021ec4393d9f6c3613c2f80703c23595fe25e