tree e0e21e3bb38e0aa11344c1c06b2aad89976ae690
parent a1bbe17ee58e659f3cc084f76981d0c57a149466
parent b8f708081db76164b6a2c5ca14739f2e4891698c
author Xin Li <delphij@google.com> 1579132623 -0800
committer Xin Li <delphij@google.com> 1579132623 -0800

DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master

Bug: 146167222
Change-Id: I0d00bf1a7d02061a012fec197b38df87d623ff62