tree 4dc1e438ce793a05d830ad3eb378e49884729a8a
parent 40f05a8ebe61d1336d451bc64907233eef5ce833
parent 0ee822a954040171159cefb67b6bcb3b3f7c4a54
author Beverly Tai <beverlyt@google.com> 1630058861 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1630058861 +0000

[automerger skipped] Merge "Fix udfps flicker on camera launch + exit" into sc-dev am: abfeb71406 am: 99e25af04a -s ours am: 0ee822a954 -s ours

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

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

Change-Id: I809aa8f74fe6575af3eed48efea23efdecbb9bd6