Merge "Add -p option when flush coverage" into main am: 0c7477b1a1 am: 5a0d2bafbb

Original change: https://android-review.googlesource.com/c/platform/development/+/2824251

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