[automerger skipped] Merge "DO NOT MERGE Hide UDFPS affordance when some...

[automerger skipped] Merge "DO NOT MERGE Hide UDFPS affordance when some dialogs show" into sc-v2-dev am: 798ebf8f am: e7f87423 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I681c3f8c124d0f81a81c1fdf6caa042a98f769b1