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

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

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



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