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

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

Change-Id: Ia61e11010e72d461d27e4149b2a20592e74dc61d