Merge "Updating Attributes on task_profiles.json" am: 91bc6d30dd am: ab4683b3d2 am: 479f4986f9

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

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