[automerger skipped] Merge "Make class open for inherit" into tm-qpr-dev am: 468352a821 am: 67f416023c -s ours

am skip reason: Merged-In Ia29ad9684e5128c715b6e7948b7edec64d95f575 with SHA-1 f944cef613 is already in history

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

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