Merge "Fully implement PK subtype rotation shortcut" into udc-dev am: 23dc1f8d57 am: 13910a65a8

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

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