Merge "Coerce component metadata Bundle to null if empty" into tm-dev am: bfb840a0 am: 9fb75495 am: ff6b24c7

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



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