tree b7b9cacbc37ee4dead0497d902f0cc4c232442c8
parent 7b5acd64c3fef308321df6c14b1afaafe1dfd813
parent 0e4b28100d3968e5a36ede8ea2f7feb9bda47dc0
author Xin Li <delphij@google.com> 1572461286 -0700
committer Xin Li <delphij@google.com> 1572461286 -0700

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

Bug: 142003500
Change-Id: I4fdcdd57eba06be140af5b4be11d649f67c0e973