Merge "Remove erroneous duplicate baseline entry" into main am: 9f5d3d26

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



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