Merge "[automerger skipped] Merge "[installd] Remove boot complete marker"...

Merge "[automerger skipped] Merge "[installd] Remove boot complete marker" into qt-qpr1-dev am: ca342596 -s ours am: 2b902ca1 -s ours am: d399dd94 -s ours" into rvc-d1-dev-plus-aosp am: 460fa20d -s ours am: 61aa06c5 -s ours

am skip reason: Change-Id I78defa45b52b868da9861a3aac28d15d8c453d16 with SHA-1 9308a544 is in history

Change-Id: Id317d4c5463cb0595f21f2d88d28c3074a933fa2