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

Merge "Increase freshness timeout" into tm-dev am: bd5a6dd6 am: 12b33cb1 am: 24ad4415 am: 0742d46a

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



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