Merge "Handle apexd failures" into main am: a401c5ddd6 am: bc43c77efa

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

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