Merge changes from topic "presubmit-am-d381d468481e4f5fb712df3e083a8166"
* changes:
[automerge] Camera: Address time drift in presentation time 2p: 14c62b8c 2p: 124809f8
[automerge] Camera: Address time drift in presentation time 2p: 14c62b8c
Camera: Address time drift in presentation time