Merge "Merge "Add factory reset protection policy Test API to DPM" into...
Merge "Merge "Add factory reset protection policy Test API to DPM" into rvc-dev am: c5e9a48d am: 6e33365d" into rvc-d1-dev-plus-aosp am: f51d4f1f am: 6ce02339
Change-Id: Ic3ca0bf2c037dd34d879c42e8ba7f05defb98a2e