Merge "Ensure consistent representation of field deprecated status" into main am: eb66630509

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

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