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

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



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