Merge changes from topic "continuous-coverage-build-flag" am: 2f0ac27e60 am: 5607a75a62

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2008848

Change-Id: I6183b475a4a116de1fc67cf92a84b5e0be638870