[automerger skipped] Merge "Remove erroneous duplicate baseline entry" into...

[automerger skipped] Merge "Remove erroneous duplicate baseline entry" into main am: 9f5d3d26 am: 9782fdd2 am: 4d2a7068 -s ours

am skip reason: Merged-In If5550b8cc0a97f02fb7fb1bd949f8e5517007d4c with SHA-1 03da14a6 is already in history

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



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