Merge "Revert "Enable pk feature flags."" into udc-dev am: 62190cc2

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



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