Merge "Update simpleperf_cpu_hotplug_test to really work host-side" am: b36835b1c8

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1579727

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icb5f5ebff56c26f99219ef2fd536da4ca2fbc6da