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: 60273c14

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



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