Merge changes I6504dc6b,I47c7eac1 am: cb54b952c3

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

Change-Id: I503a61ca4218084831412abf1b520930620bef90
tree: 65ce9cee85c4000bee4b245b1df5e1fa47e175c8
  1. apex/
  2. authfs/
  3. docs/
  4. microdroid/
  5. tests/
  6. virtmanager/
  7. vm/
  8. .clang-format
  9. PREUPLOAD.cfg