Merge "Add wakelock to UserCallActivity" am: ff389cfef0
am: ee995e795d

Change-Id: I2e2b06592bf8cd8b33967fd609e4a2f1517eb6dc