tree da7f6725407d4ece9fd372ce4ce8406d5dade979
parent eed98a3e6b5edc56ba915ca24f462c1419f6fd7f
parent b770c451762c8efb1dcf93fa9a14ad42bc550e30
author Xin Li <delphij@google.com> 1572475111 -0700
committer android-build-merger <android-build-merger@google.com> 1572475111 -0700

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

Change-Id: I4978ea01094640bbdd751787b0329f6dbcf44e30