Merge "Correct returns if PCC is enabled." into udc-dev am: 39928511 am:...

Merge "Correct returns if PCC is enabled." into udc-dev am: 39928511 am: bced26aa am: b5384646

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



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