Merge "Camera: Clear identity before access device policy manager" into main...

Merge "Camera: Clear identity before access device policy manager" into main am: 6cc59823 am: 63827abe

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2652179



Change-Id: I4b398800a92462b0d3b192208296d1c77762ac5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>