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

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



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