Merge "Wake up from the standby mode and display message on the keyguard screen" am: 5a2d65c45e am: e31a695313
am: 99a0928057

Change-Id: I4de9f577523d61d7f5a00a08d44b1174ab17c96c