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

Change-Id: I450b4cd8bface92b49f43692758bd9063e426880