tree 5704e98cea15fb2204408c0932eb0e911b8652d8
parent c0f4a2edd57ec26335ac52efd4584552cea19f2c
author Evan Rosky <erosky@google.com> 1548467166 -0800
committer Evan Rosky <erosky@google.com> 1549409619 +0000

Merge metadata from transaction instead of replace

This was replacing metadata when set in transactions rather
than merging. To fix this, merge has been augmented to also
report if a change occurred and to erase empty entries (as
a mechanism to "unset" metadata)

Bug: 122925737
Test: Added more unittests
Change-Id: Ia854cbcc1ddd334f18ffacea667cbb98778ec210