Merge "Make servicemanager use "bootstrap" bionic" am: cdc064ed7f

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

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