Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: I3c9e9d15786fbead1b874636b46844f6c24bccc2
Change-Id: Id6cf6cc13baef4e67486c6271a1510146204affa
tree: 6ab79b0ee67e7d0ea776a6e7a3fa004c7ae4e25c
  1. Vcn/