Merge "Increase freshness timeout" into tm-dev am: bd5a6dd6 am: 6a747033

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



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