Merge "Defer peek legacy configuration until after startup" into tm-qpr-dev...

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

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



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