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

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

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



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