tree efb081348103d7f0be9caf54146720f48dae1f71
parent e87320d04c0b5c1c7902afa036ea5bdd6da66521
parent b6cf00fcf256c9d8b2f190322de70cff7a7121b5
author Xin Li <delphij@google.com> 1575350705 -0800
committer Xin Li <delphij@google.com> 1575350705 -0800

Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: Iff8f01185ac10136a5aac5085498a96b63efece2