Merge "Handle apexd failures" into main am: a401c5ddd6

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

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