[automerger skipped] Merge "Add tracing for setEdgeBackPlugin" into tm-qpr-dev...

[automerger skipped] Merge "Add tracing for setEdgeBackPlugin" into tm-qpr-dev am: 95a1377b am: b2ddeb8e -s ours

am skip reason: Merged-In I74e793467eb37705b2647d0ea9c64bd7b5191d9e with SHA-1 3b0a43b5 is already in history

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



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