Revert "Modify bookmark shortcuts for platform alignment"

Revert submission 30131710-bookmarks

Reason for revert: DroidMonitor: Potential culprit for http://b/380980150 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:30131710-bookmarks

Change-Id: If76fc151cbd86f9cb56553bf9134cda6afd12773
8 files changed