tree efa11c59da843e994c4ebb204d8bb1e3fb319479
parent e3d8716228790ebcb8af94bb766bd2d57739d2dc
parent 31adf69cd845767bbaaf3eb6ac95b60ff8ac6628
author Xin Li <delphij@google.com> 1598548621 -0700
committer Xin Li <delphij@google.com> 1598548621 -0700

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

Bug: 166295507
Merged-In: I43f896443fd0b36d3538b242bdaa859181eb8eee
Change-Id: Ifb8126ec6c2ae6e79afc1a0cc620dc2f062df96d