[automerger skipped] Merge "PM: Restrict subclass construction." into...

[automerger skipped] Merge "PM: Restrict subclass construction." into tm-qpr-dev am: 32d7d7fe -s ours am: bc846c08 -s ours

am skip reason: Merged-In I328eca7b8de1eab637e3991adeb2e1d147c30268 with SHA-1 9937e719 is already in history

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



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