Reland modify bookmark shortcuts for platform alignment

This CL will modify the AOSP default bookmarks to align with other
platforms.

This is a reland as a test had not been adjusted, causing presubmits
to fail.

Bug: 370930887
Test: Flashed AOSP build on device
Flag: EXEMPT changes only to tests and resources
Change-Id: Ic33748ea4a68f64ca775ae308732c127f4fc467e