tree f67802323b1befb80e232233bbee7361bb7cd3e4
parent f3f7cd2d972cc25b5f49806cfc1fa16ad18736f4
parent c8dcba18eb1da0f461d3ef171e0d87acd24b1f51
author Xin Li <delphij@google.com> 1572461379 -0700
committer Xin Li <delphij@google.com> 1572461379 -0700

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

Bug: 142003500
Change-Id: Ibf1d3f856be4abc1dd757ea2f7a38107015ee730