[automerger skipped] Merge "Fix udfps flicker on camera launch + exit" into...

[automerger skipped] Merge "Fix udfps flicker on camera launch + exit" into sc-dev am: abfeb714 am: c295ce4a -s ours

am skip reason: Merged-In Id3aa20662df8cdd6676141f5f70e5eae0cec6215 with SHA-1 38106414 is already in history

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

Change-Id: I1dd79f693708b025b5a1c4942a9484d1ef49a460