tree 8080c28a06af52bf28799c3f80aa1bcfd3dba0c7
parent 7e8de18e8c14a2200feebfef2dd2426c20a81ddf
parent 61bf72313d22ffece698e57354c1b8ecfb9fbecd
author Xin Li <delphij@google.com> 1572470360 -0700
committer android-build-merger <android-build-merger@google.com> 1572470360 -0700

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

Change-Id: Ibe5a62d65fd64c57749a2fae63498ee16c20c56d