tree c9a5028972d15e069bae702bd0917a7a40be1dc8
parent 7f5dc700c77c2d6d12a8ed0d3e9139510232fe60
parent df1fdccaaa1ac27730ed3bb1e83fa259f40c8e5d
author Xin Li <delphij@google.com> 1598548566 -0700
committer Xin Li <delphij@google.com> 1598548566 -0700

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

Bug: 166295507
Merged-In: Ia85b6f41af2746d4ba682ab08cdc8b614922d3b6
Change-Id: I948b08c082361c086de1088069a76ca1cc64ded6