Merge "Merge "Remove MEDIA_FALSING_PENALTY flag" into udc-dev am: 55a04817 am: 12e3835b am: f524047f" into udc-qpr-dev-plus-aosp am: 4d3bfefd

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



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