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

Change-Id: I1c1437f83387aa4974ee991502018f5b59baf248