tree e4f796af2471b45db3b3b1a58cb093c6bba05159
parent 8a6f081643f8abf7643a87077ea6008067b280c9
parent a44b9e17c7e765aae2ceb29637f6e6f35c70aa25
author Xin Li <delphij@google.com> 1598548602 -0700
committer Xin Li <delphij@google.com> 1598548602 -0700

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

Bug: 166295507
Merged-In: Ibe9b0af76fd841db7e64bf8800264df149278cbf
Change-Id: I941272023ad401c3b4d5e4bfa17a0e6080331cf7