[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 42b79fa5bd
am: aa4c4659d0 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifaaa3d4316ceef7e569f84af9acb016066afb016
tree: f09233dd2dabee59c9c40d580bda1cbe183621cf
  1. amber/