CDD: Relax BLE RPA timeout requirement to STRONGLY RECOMMENDED
Section: 7.4.3. Bluetooth

We have learned that by having this requirement, there are potential
interoperability challenges with older Android devices if they run an
app trying to attempt to use both BLE and Bluetooth classic for pairing.

Bug: 27339128

Change-Id: Ic2e70a0084f44ed9fd2de9d475146ccbca516e9b
diff --git a/src/compatibility/6.0/android-6.0-cdd.html b/src/compatibility/6.0/android-6.0-cdd.html
index 82eba96..526a30d 100644
--- a/src/compatibility/6.0/android-6.0-cdd.html
+++ b/src/compatibility/6.0/android-6.0-cdd.html
@@ -3980,8 +3980,9 @@
   <li>MUST declare the hardware feature android.hardware.bluetooth_le.</li>
   <li>MUST enable the GATT (generic attribute profile) based Bluetooth APIs as
 described in the SDK documentation and [<a href="http://developer.android.com/reference/android/bluetooth/package-summary.html">Resources, 100</a>].</li>
-  <li>MUST implement a Resolvable Private Address (RPA) timeout no longer than
-15 minutes, and rotate the address at timeout to protect user privacy.</li>
+  <li>are STRONGLY RECOMMMENDED to implement a Resolvable Private Address (RPA)
+timeout no longer than 15 minutes and rotate the address at timeout to protect
+user privacy.</li>
   <li>SHOULD support offloading of the filtering logic to the bluetooth chipset when
 implementing the ScanFilter API [<a href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html">Resources, 101</a>], and MUST report the correct value of where the filtering logic is implemented whenever queried via the
 android.bluetooth.BluetoothAdapter.isOffloadedFilteringSupported() method.</li>
diff --git a/src/compatibility/android-cdd.html b/src/compatibility/android-cdd.html
index f4ffebc..2187358 100644
--- a/src/compatibility/android-cdd.html
+++ b/src/compatibility/android-cdd.html
@@ -3980,8 +3980,9 @@
   <li>MUST declare the hardware feature android.hardware.bluetooth_le.</li>
   <li>MUST enable the GATT (generic attribute profile) based Bluetooth APIs as
 described in the SDK documentation and [<a href="http://developer.android.com/reference/android/bluetooth/package-summary.html">Resources, 100</a>].</li>
-  <li>MUST implement a Resolvable Private Address (RPA) timeout no longer than
-15 minutes, and rotate the address at timeout to protect user privacy.</li>
+  <li>are STRONGLY RECOMMMENDED to implement a Resolvable Private Address (RPA)
+timeout no longer than 15 minutes and rotate the address at timeout to protect
+user privacy.</li>
   <li>SHOULD support offloading of the filtering logic to the bluetooth chipset when
 implementing the ScanFilter API [<a href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html">Resources, 101</a>], and MUST report the correct value of where the filtering logic is implemented whenever queried via the
 android.bluetooth.BluetoothAdapter.isOffloadedFilteringSupported() method.</li>