[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: 99e25af0 -s ours

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

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

Change-Id: Ifa3fa62a459bb2ac90e93e66efb3d25ec49daec2