[automerger skipped] Merge "Fix udfps flicker on camera launch + exit" into sc-qpr1-dev am: b0a0874290 am: 3d3a1ab4dd -s ours
am skip reason: Merged-In Id3aa20662df8cdd6676141f5f70e5eae0cec6215 with SHA-1 e8f14f4813 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15661877
Change-Id: I665f8a93e03cb989be3c1a778899b64bcbcfe7be
This commit is contained in:
committed by
Automerger Merge Worker
commit
7280b842ef