tree 9c4a43c242bf92beb925b218c7cdad5894a33e18
parent b8fcb2f508d1a9fa02f8172651cda0986b71bb55
parent 8fcd2841bca83488d08907174050ff85f35686d2
author Xin Li <delphij@google.com> 1598548612 -0700
committer Xin Li <delphij@google.com> 1598548612 -0700

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

Bug: 166295507
Merged-In: Ifb40c05ce8c1ace2166f1c84443c2dd763265993
Change-Id: I4fd03cb0e92605e8847af116a4d3f413bb2a8bcb