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: 74b6e282 am: 177fe204 am: afb2fd99

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



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