Merge "Remove NO_HUN_FOR_OLD_WHEN flag" into udc-qpr-dev am: 656b039a

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



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