Merge changes I9b387da8,Iabeca8c4 am: 2c770e73a7

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/1718972

Change-Id: I7200da91d03bc3d0fbeaa4aa27a5bbd37bb67f05
tree: 9a56589a12300cb517be16c644741f33ec5648fb
  1. apex/
  2. authfs/
  3. compos/
  4. docs/
  5. launcher/
  6. microdroid/
  7. tests/
  8. virtualizationservice/
  9. vm/
  10. zipfuse/
  11. .clang-format
  12. PREUPLOAD.cfg