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

Change-Id: Ia5bc1d228449c6f78d54f25c392b3ea33c80ddef