Merge "Add NO_HUN_FOR_OLD_WHEN flag." into tm-qpr-dev am: 7a30dc32 am: 4b6cb124

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



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