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: I58b7590d778e4ed3788774f499d00a772bd1052c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>