Merge "Revert^2 "Recommend writeTypedObject()"" into main am: 3c0e248b55 am: aafccc904d

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

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