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

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

Change-Id: I35cfd9e729e6dc8847b02d8641baba74ee21d4d9