[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master am: 04687a7d70  -s ours
am: 7885bb2f2b  -s ours

Change-Id: I7a106cbeffba28fd5f79d17df018ae90420976f2