tree 6851b188dff6cea9efe7726e9ce02165f6d071e2
parent acb288e0849e4d37c6e92299a0add19a3a885cdb
parent 0f7eb92288b25b8b2f51d0ccf6227bbd52f74a24
author Xin Li <delphij@google.com> 1572461407 -0700
committer Xin Li <delphij@google.com> 1572461407 -0700

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

Bug: 142003500
Change-Id: Ibbb367980b91ccb20b23e391a0fccde3d7b0a98a