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

Merge "Merge changes from topic "peek-default-mode" into tm-dev am: 813869b7 am: 8cbeb87b" into tm-d1-dev-plus-aosp am: 5b1dd941 am: 0db1c482

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



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