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

Change-Id: Ic1c34f58c5e3c769e9a00c6604b7cdf9278ba181
tree: 5ec2162cd8079c1b21ce979a3335fa260dc64672
  1. tests/