Merge "Merge "Correct returns if PCC is enabled." into udc-dev am: 39928511" into udc-dev-plus-aosp am: db3f51e7 am: e6951261 am: 40d1d2fe

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



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