Merge "DO NOT MERGE Make classes open for inherit" into tm-qpr-dev am: 7ef14c02c0

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

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