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

Change-Id: I1a1018670a20f3e61c944651463c48e42ad64a64