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

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



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