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

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



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