Merge "Make servicemanager use "bootstrap" bionic" am: cdc064ed7f am: 5223207e9f am: f5517d1461

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

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