tree 0fc4382b0792c910e2215c77171cc7b77c30c6d8
parent 923cdf3db1fb3c8c148a9f5bdac84a4e77cea776
parent 1c87c957f50ae584e0a8a3c1c7713a67c613224a
author Xin Li <delphij@google.com> 1606165940 -0800
committer Xin Li <delphij@google.com> 1606165940 -0800

Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855

Bug: 172690556
Merged-In: Idc15c7280ab625d015801313ae71bf04a5abdf81
Change-Id: I2d3ec29aa5b0c162c70e7712025eaa22ec769dcc