Merge "Camera: Address time drift in presentation time" into tm-dev am:...

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

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



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