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

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



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