Merge "Defer peek legacy configuration until after startup" into tm-qpr-dev am: b6f22b51

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



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