Merge changes from topic "task_profile_crosvm" am: 5590e115 am: d762a26d am: 1b82ab32

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



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