Merge "CDD: Correction to build parameters BASE_OS & SECURITY_PATCH." am: 0fc5bdedaf

Original change: https://android-review.googlesource.com/c/platform/compatibility/cdd/+/1789498

Change-Id: Id80e4e4e54dc8574978e20da5f003be146f73eaa