Merge "Merge "Camera: Add support for readout timestamp" into tm-d1-dev am:...

Merge "Merge "Camera: Add support for readout timestamp" into tm-d1-dev am: daf69b3d am: 13908d1a" into tm-qpr-dev-plus-aosp am: 1722d42d

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



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