Merge "Add apexd_payload_metadata_prop" am: a6d6b6aee8 am: a4e0ed83dc am: ebd1ff5b25 am: 01aca6282a

Original change: https://android-review.googlesource.com/c/platform/system/sepolicy/+/1885013

Change-Id: I342f9539b3f91134e4a50469fdabf79d84f101d1