Merge "Add wakelock to UserCallActivity"
am: ff389cfef0

Change-Id: Ia9c0cda3781f70c20181180c50bf4b47cc28f672