tree e9fb14bd73b8f85c9c77b77ad76e7870a356acf0
parent ecd2315d45ff33094935cc7bda76f8d3b0f08914
parent 358dcaf4709433e3aaffd43f9676894c2e46e391
author Xin Li <delphij@google.com> 1572461311 -0700
committer Xin Li <delphij@google.com> 1572461311 -0700

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

Bug: 142003500
Change-Id: Idf9f782a0ccb7421478ac1182c36d16f78eda3a9