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

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



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