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

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

Change-Id: Iae8576668b6acf47845c1dec09a34e7209106405