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

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



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