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

Change-Id: I2bb19a2cb832111ee29ef3762c3b13808dde3b11