[automerger skipped] Merge "[installd] Remove boot complete marker" into qt-qpr1-dev am: ca3425964a -s ours am: 2b902ca117 -s ours am: d399dd948a -s ours am: 57e7415fef -s ours

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

Change-Id: If0d379f5a5450837926c14f021e4dbfb352bb0dd