Merge "Make servicemanager use "bootstrap" bionic" am: cdc064ed am:...

Merge "Make servicemanager use "bootstrap" bionic" am: cdc064ed am: 5223207e am: f5517d14 am: bc51e8b7

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



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