[automerger skipped] Merge "Mark boot completion via apexservice" am:...

[automerger skipped] Merge "Mark boot completion via apexservice" am: c1cef10d am: 1ae3832f am: aa1539ec am: b7eca458 am: 09f1e056 -s ours

am skip reason: Change-Id Ibcb4cb784243530eb2cf8c2633651342e8115d14 with SHA-1 221f3ec5 is in history

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

Change-Id: I7f38cb5254a2f803516c5c7e6544d20f54614f03