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 am: fbad94fb am: a7cc759d am: a59822ce

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



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