Merge "Promote no_hun_for_old_when to teamfood" into tm-qpr-dev am: cbb3c5d9

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



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