tree 4c827da1dc16242988b590118c48b14aed09da50
parent fdfbee4e5969b9adc82421d028d1421be3b7423c
parent 4f62be24ccfaf25e766836ffb25dde333a511b10
author Xin Li <delphij@google.com> 1572461409 -0700
committer Xin Li <delphij@google.com> 1572461409 -0700

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

Bug: 142003500
Change-Id: Iff6feab8bdf144ed7f6cb62832339602af237ec0