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

Change-Id: Ia038e531542ccf7532345d39a7019245b0c43693