Merge "Add suspend_resume_minimal synthetic ftrace event" am: 953901508c am: 98c7d71dfe

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

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