[automerger skipped] Merge "Add BD clear to configurable parameters" into sc-dev am: 63c081c311 -s ours am: a261212877 -s ours

am skip reason: Merged-In I04b754a4caca294869e6da74f3f84cf5cd7c4e02 with SHA-1 947794b46f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/bonito-sepolicy/+/15247999

Change-Id: Iffe9ee14bbab94ec8be1ec262ad66a67bc7b1894