tree b0f66e2bacf9250c370f5455691ab68403acbbe7
parent d4b1d127f1b96756c424f606c3308d73cb450dcc
parent b95e2339e3040470dbe7096f59b77c9cc1b776ff
author Xin Li <delphij@google.com> 1598548563 -0700
committer Xin Li <delphij@google.com> 1598548563 -0700

Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)

Bug: 166295507
Merged-In: I34ccc9cc6314aeb5babb95302be1801fc9bacd99
Change-Id: Iaee18ba48fc5a8ec511074dd10d69c383e92583b