[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master am: 07ea8a407d -s ours
am: 659576f54f -s ours
Change-Id: Iadfa0ee17ed14272aeadfac213126175544ed732
This commit is contained in: