Merge "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main" into main am: 894f009785

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

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