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

Change-Id: Ic05ad807c62db772fd35b8da4acfa1c2bcb79060