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

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

Change-Id: Ice7b502c830b21f9964502c4b1f5d77ccbff9c29