[automerger skipped] Merge "Add Mainline update hook for Pre-reboot Dexopt." into main am: 4c1462a709 am: 1152b137a8 -s ours

am skip reason: Merged-In I604030f6d5df108bc6632e014ce35ebddb5dfaac with SHA-1 d1867563c1 is already in history

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

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