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

Change-Id: I647e27100bb1429b2fc1fd1ee474dc763d2cbbfb