tree e3d2ceadfd465d7a5381f4e1e52270e5da4ea1ca
parent d34e731b1f38e93ad2cb710575815e88526a3c2c
parent 6aa5607fc98d65d4d2d8418fe7f0fb1eeb45ea4f
author Xin Li <delphij@google.com> 1572461306 -0700
committer Xin Li <delphij@google.com> 1572461306 -0700

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

Bug: 142003500
Change-Id: Ia41e72df732a1f779dd0c4eb0f39a419685e5193