Merge "Simplify wrappers for opaque boxed types" into main am: 1e13026afa Original change: https://android-review.googlesource.com/c/platform/tools/security/+/3341545 Change-Id: Ia308f2b7dd760c495c0f497c488b31b25af8ee64 Signed-off-by: Automerger Merge Worker <[email protected]>