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: 8cbeb87b am: d55c1dea

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



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