Merge changes from topic "peek-default-mode" into tm-dev am: 813869b7 am:...

Merge changes from topic "peek-default-mode" into tm-dev am: 813869b7 am: 360ccfd3 am: ae12a9ef

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



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