DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master

Bug: 142003500
Change-Id: Ic8505c810f7711f882c7b4bc21632f391508a9ba
tree: f09233dd2dabee59c9c40d580bda1cbe183621cf
  1. amber/