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: 62e1784b" into rvc-d1-dev-plus-aosp am: 0216a7d4
Change-Id: I26b8a0f45e89f0033e0129e99b351b92a621f8f0