[automerger skipped] Merge "Removed edge and tip hint for udfps" into...

[automerger skipped] Merge "Removed edge and tip hint for udfps" into sc-v2-dev am: 00d11003 am: 8b615710 -s ours

am skip reason: Merged-In I8cc04956e8e041f43d76ccbb2ec8585b296138be with SHA-1 8e18adc7 is already in history

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

Change-Id: I748cedc1f28685bc9caca2aacf6213b9f218ebeb