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

Change-Id: I620010be975c04bf76e9eee8db22069e34d8237e