tree f2c8dedcc2d474646878fb7c4e41edb24a92d496
parent 32320f2feead72c9b8b4b7157567909eaba8810c
parent e27051b33ccc6ff9e7ce3f883147215fecd3badf
author Xin Li <delphij@google.com> 1572475041 -0700
committer android-build-merger <android-build-merger@google.com> 1572475041 -0700

[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 883e1d0668
am: e27051b33c -s ours
am skip reason: subject contains skip directive

Change-Id: I4993561f1a5c76f4976c373f5b57fac74fbdff8c