Merge "Fix screen-on speed during phone call" into rvc-dev am: a0cecdfe8f

Change-Id: I7a98715af19c54183bc9b0aae9de07ed39cf7f99