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