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