[automerger skipped] Revert^2 "Frozen-aware RemoteCallbackList" am: 04f26a4953 am: fbec4ee2e9 -s ours

am skip reason: Merged-In Iba5b9c9e52f4b4d892bd3d553dcf504bf7498597 with SHA-1 8d50dd5399 is already in history

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

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