[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "metalava-allow-add-final-on-uninstantiable-class" into udc-mainline-prod am: f549fe31 -s ours

am skip reason: Merged-In I6c83425c1be1783b10c051afc77c096523923e9d with SHA-1 45803fe7 is already in history

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



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