Merge "Camera: Address time drift in presentation time" into tm-dev am: 088d7d80 am: c0f61d0c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/17693282



Change-Id: I39b70997581f50af46ea27aef04cc02b941767d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>