Merge "Allow the default mode for video peek to be undefined" into tm-dev am:...

Merge "Allow the default mode for video peek to be undefined" into tm-dev am: a4b0d8af am: a049054c am: 989c8962 am: f1e937ce

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



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