Merge "Merge "WrappedApplicationKey: Remove superfluous branch in...

Merge "Merge "WrappedApplicationKey: Remove superfluous branch in deserialization." am: 2e6b40a8 am: 2efefc72 am: f464e50d" into tm-dev am: a4b25400

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



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