[automerger skipped] Merge "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main" into main am: 894f009785 am: f7c7e28fc1 -s ours

am skip reason: Merged-In Ie486d73bc3dfe74f5048bd132e2ea68ab8e7b006 with SHA-1 2381fd70fe is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/31817629

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