DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master

Bug: 151763422
Change-Id: I446a65fe7476f6151c01fc40a619193422f3c739
tree: 29ab62d90a15df69c63cdf292037fc5675b7fb1d
  1. android-5.4/