tree 6187e24df2a72b7e06c0c0662429588f73442f83
parent 0c2c876125b5ead374d30d05fa45bdcfa8509a8f
parent 954ba122836e1f6209874b89371c700d20744100
author Xin Li <delphij@google.com> 1572461306 -0700
committer Xin Li <delphij@google.com> 1572461306 -0700

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

Bug: 142003500
Change-Id: I175f1a28cea276f2a032104d2c9927b62e0cf7d0