tree beaf800d3b60622a2bb9d35ee542cf3e0e3ce11a
parent fb7d9a4e2fdd24520a83a98753345ea8775ba40e
parent 45bf3818361f174418fb242cf44086eebf6d42b4
author Xin Li <delphij@google.com> 1572461391 -0700
committer Xin Li <delphij@google.com> 1572461391 -0700

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

Bug: 142003500
Change-Id: I82ef226f494cf05a21a97358023f2c1a772849cd