tree d5944152a727a06bac6b49c9b8442d046fc6d81e
parent 98097fcd3355ec68a84fec704e4f00f510fcc855
parent 18ee0215a621e109cfaeaad86730e07f7a38fdbe
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: I1f0e6384efc0083a597b043199315a8fb348d284