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" into tm-d1-dev-plus-aosp am: 81f05702

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



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