Merge "Add servicemanager.microdroid" am: 5cba3db3f6 am: 005156abcd

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1956040

Change-Id: If3d2f09a95fef869a99ff495a838d3aaa8867a59