tree 6659dcc4059089b12210f41728045f3e072d3d8b
parent 91e1aeb5604cb7737d96d2521f15055637f31663
parent 42347d06d28e140071bd4bfcff7d2ef3623a1a62
author Xin Li <delphij@google.com> 1572461204 -0700
committer Xin Li <delphij@google.com> 1572461204 -0700

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

Bug: 142003500
Change-Id: I5cfba57d9d4d6752313f2ad4938c8d2999a44672