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

Change-Id: Idda4a1965dec2ab4eb78257f3c4451d7b08e6381