Merge "Merge "Increase activity exit-info timestamp resolution" into rvc-dev am: 7843e91e am: de06dac1" into rvc-d1-dev-plus-aosp