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

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



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