Merge "Merge "Camera: Update doc to describe tradeoff of DEFAULT timestamp base" into tm-dev am: b15596cb am: 065c279c am: cd6cca47" into tm-qpr-dev-plus-aosp am: 91b2cedf

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



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