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 am: d5caa553

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



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