tree 8c690c362ddd65d174774a239bd645c0c2fad68e
parent d943b1323f2cf5d80eec463f08adb35859b3c5c2
parent 6fa148fcf79c5c1edb90a1e8d383938c18ce1ded
author Xin Li <delphij@google.com> 1572461278 -0700
committer Xin Li <delphij@google.com> 1572461278 -0700

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

Bug: 142003500
Change-Id: I680c223fe50fadfabeeb03d3f161815f2237c247