Merge "Don't assume R class fields are constants" into main am: daefc88864 am: 6381f69b8d

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

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