[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 -s ours am: 311d0ebb -s ours am: f738bb35 -s ours am: 0a9270f6 -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: I205303ebe095334df8781c55c969bdf0511e7906