Merge "Remove erroneous duplicate baseline entry" into main am: 9f5d3d2641 am: 9782fdd2e4

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

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