tree cd524d1c44ed5ba56e86e6ff9a0fbf7505cc0160
parent 4e4f227db57822747b097c83096f5590b4f90772
parent c4e17d8ad11078cb976439950346ee774282d16c
author Xin Li <delphij@google.com> 1572471615 -0700
committer android-build-merger <android-build-merger@google.com> 1572471615 -0700

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

Change-Id: I7d00beaf11d21c53ea4891e8868d609748fca507