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: ace5e56d

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



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