[automerger skipped] Merge "Mark classes as final that have final destructors"...

[automerger skipped] Merge "Mark classes as final that have final destructors" am: eb7dfa2f am: 5f525b6e -s ours am: b48d8b0f -s ours

am skip reason: Merged-In Ia3126d30e19edfd17f7c8da368e9763ca5501e84 with SHA-1 0583e7f5 is already in history

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

Change-Id: I090e368a16ccf50b87dae712cb20035d3e0f5336