tree 9d0522efd9cd37de8db7d304f3d0d71535d20114
parent b740c5e12e313e90f5d6754d04c72f19503aea57
parent 44f2e45de2db521a9b17cc503c6f7a69fccc58a8
author Xin Li <delphij@google.com> 1598548662 -0700
committer Xin Li <delphij@google.com> 1598548662 -0700

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

Bug: 166295507
Merged-In: If0012214cee84d7e317b338d99778cdfb08b8cf4
Change-Id: I13bd92e0dd2a3a4094a7c8e19097a88a94b147b2