Merge "Don't assume R class fields are constants" into main am: daefc888

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



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