Merge changes from topic "apexd-refactoring" am: 39f60ee4d9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I360ac59baa7ef92fa31db3e0bb5f93feaae34c06