[automerger skipped] Merge "Migrate UDFPS logs to LogBuffer" into tm-qpr-dev...

[automerger skipped] Merge "Migrate UDFPS logs to LogBuffer" into tm-qpr-dev am: e71cdf41 am: 89aa392e -s ours

am skip reason: Merged-In Ie0354ae4b0832e5794aab4e7d4f7c0d1b0491414 with SHA-1 bd1ba324 is already in history

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



Change-Id: Ifcb6a702f3f619ffb9a67550304d47fcbfd6ab64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>