Merge "Make class open for inherit" into tm-qpr-dev am: 468352a8

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



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