Merge "Make servicemanager.microdroid uninstallable" am: c7ead71bd5 am: cd5f30eb5f

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

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