tree d7443ea6a06ca06fc5d0be43920602c3401bd42a
parent 6ae43a93d4f14dedf7df3da3e79d49723f430c33
parent c98b9f03efbffb8e7485927dfd1cbb4acb7eba76
author Xin Li <delphij@google.com> 1572461276 -0700
committer Xin Li <delphij@google.com> 1572461276 -0700

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

Bug: 142003500
Change-Id: I8d8028abfed096bbbd1641dd923814047a1c2bfd