tree 3a5b26e145f6189bd77e7bf27090cad9404ff208
parent 7076954bab9fb3e340c1b3e67f0e5935eb693238
parent d3bbda3565cfd8348d8a6366f1013a163ed2aaf3
author Xin Li <delphij@google.com> 1572476306 -0700
committer android-build-merger <android-build-merger@google.com> 1572476306 -0700

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

Change-Id: Ica7554757d06b9f5ff92519a565381f7d6ce20cf