Merge "Add -p option when flush coverage" into main am: 0c7477b1a1 am: af461bfdc7 am: d2f2e73e1f

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

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