Merge changes from topic "task_profile_crosvm" am: 5590e1152e am: d762a26dbe

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2059550

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