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

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



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