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

Change-Id: Ic055538f22a0d8271e07a9c697b7f8f82582c7f3