Merge "Make servicemanager.microdroid uninstallable" am: c7ead71b am: cd5f30eb am: c4e1c0b3

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



Change-Id: I289d8643f12e0c741c9c247269c69d0c8b5307ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>