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: 46f773d0 -s ours" into rvc-d1-dev-plus-aosp am: de4df231 -s ours am: 36220c75 -s ours

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

Change-Id: I3821e1ba0944632f0e17b1ab7988cda871604a8d