tree 57450390cce9308a455e9d877e979a8ef4783dd8
parent 7b4781cb2ae9b55585f55ea5b4d81c062d1f0cf7
parent abb944c9fe31ae8f2816b3d04774ea2228824729
author Xin Li <delphij@google.com> 1572461331 -0700
committer Xin Li <delphij@google.com> 1572461331 -0700

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

Bug: 142003500
Change-Id: Idc77b7cc402f85aaf5ea55a07561cd596598a836