[automerger skipped] Merge "DO NOT MERGE Make classes open for inherit" into tm-qpr-dev am: 7ef14c02c0 am: f0e50cee4d -s ours

am skip reason: subject contains skip directive

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

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