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

Change-Id: I2c413dd71ac812ccd907f31ab0f2ae64519cc375