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

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



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