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

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

Change-Id: I6806a93d9cc857f85b4399df423732070d15cdad