Merge "Ensure consistent representation of field deprecated status" into main...

Merge "Ensure consistent representation of field deprecated status" into main am: eb666305 am: 3aca7f8b

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



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