Merge "Mark boot completion via apexservice" am: c1cef10d58 am: 1ae3832f56

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

Change-Id: I3c74e6443f1589610ec5a38ee747c8949b06bd4c