[automerger skipped] DO NOT MERGE Make classes open for inherit am: 1953c57edf am: 375960e1fe -s ours

am skip reason: subject contains skip directive

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

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