Merge "Fix minor time bug in ConsentCallback::getElapsedTimeMs" am: 3ed7588987 am: c17ca50b17

Change-Id: I8f700fdbc1fd32e8bd6109a491725dcb4bd693c4