Merge "Increasing Penalty on UMO taps" into tm-qpr-dev am: 3c410d04

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



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