am 0d22608c: resolved conflicts for merge of bcb86374 to lmp-mr1-dev-plus-aosp

* commit '0d22608cf3cedc6e83b90b571b1042a0a714c983':
  Tell installd when boot completes.