Merge "Make private, single-assignment fields "final" in android.content." am:...

Merge "Make private, single-assignment fields "final" in android.content." am: 1614089e am: 028bbee5 am: d5f67632 am: 5f97e1c4 am: 51799384

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



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