Merge "CDD: Add a BLE RPA timeout condition to only be enforced while the device is actively advertising." am: 4cecb1ddda

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

Change-Id: I091686f21f43546870f7d2f89acb989e5bdef20e