Merge "Increase freshness timeout" into tm-dev am: bd5a6dd6 am: 12b33cb1 am: 24ad4415

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



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