tree 0c0ecdf5b587c2a1c80cfed8d40c5aab3c0d7f46
parent c43596858bbe4d60549454861c8c575804b88dfc
parent 672db0a3112bc63569d9186bb648446f5d078679
author Xin Li <delphij@google.com> 1572461449 -0700
committer Xin Li <delphij@google.com> 1572461449 -0700

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

Bug: 142003500
Change-Id: I8f64dab16a41541eddc6924489d37ba35ced2cff