[automerger skipped] Merge "Revert^2 "Remove deprecated Beam APIs"" am: d0f581d067 am: ef31385978 am: 1dfadd8ca0 -s ours
am skip reason: Merged-In I1695121365293423a63e23f6060910950f343c42 with SHA-1 fc35370bdb is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2475022
Change-Id: Ide7aa5437ac9137ea46380657c87732a1c5e252a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: