Merge "Clear TrustedPresentationListener when a new listener is set" into udc-dev am: 3fcbb3bf

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



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