Merge "Wait for keyguard draw before stopping boot animation" into oc-dev am: ff4cc4ebb5
am: 0bdd7ae68e

Change-Id: I53c900ebe66b99fc1596d57e0f43dc32248f8340