Merge "signature_trie: Avoid unnecessary wrapping and unwrapping of values"...

Merge "signature_trie: Avoid unnecessary wrapping and unwrapping of values" am: ffd5b32a am: 91620539

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2054407



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