Merge "Make apexd consider decompressed APEX as factory packages" am: 7e4bd60724

Original change: https://android-review.googlesource.com/c/platform/system/apex/+/1581783

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6a5dfec7266df80361398449a76a7d8d7ece3a64