[automerger skipped] Merge "Clear identity when releasing display resources."...

[automerger skipped] Merge "Clear identity when releasing display resources." into udc-dev am: f38af450 am: 57c1b777 am: e2094e3a am: adaa2d99 -s ours

am skip reason: Merged-In I40447a461409fb523be3932d67b1fc6f0843e9e9 with SHA-1 cafd1681 is already in history

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



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