tree 60b12d56a985141909257a395217c3fb5284add1
parent 7ffbb7d871dc0901285a4edd14035d8af75bc7e9
parent 19ab98de66f2f635730cb8abc45440aa894292e4
author Xin Li <delphij@google.com> 1572461369 -0700
committer Xin Li <delphij@google.com> 1572461369 -0700

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

Bug: 142003500
Change-Id: Ibf4559fc952f538d788eb85b2447bbe1234d0143