[automerger skipped] Merge "Revert^2 "Remove deprecated Beam APIs"" am: d0f581d0 am: ef313859 am: 1dfadd8c -s ours am: 142c5c5e -s ours am: f8dcc267 -s ours

am skip reason: Merged-In I1695121365293423a63e23f6060910950f343c42 with SHA-1 fc35370b is already in history

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



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