Merge "Merge "Allow the default mode for video peek to be undefined" into...

Merge "Merge "Allow the default mode for video peek to be undefined" into tm-dev am: a4b0d8af am: 74b6e282" into tm-d1-dev-plus-aosp am: 9eb110a6

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



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