tree 1513f223b2409e247b5ff904fe6fbe4a975b9512
parent b39d8cfd127a7495a4a8de0f542a38ce0144a1c1
parent 49df1db06e3ca78526b99aae0f66db6ff751eabe
author Xin Li <delphij@google.com> 1572476590 -0700
committer android-build-merger <android-build-merger@google.com> 1572476590 -0700

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

Change-Id: Iefb108f79f05f676d41c613ea3a9009a285985c9