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

Merge "Merge "Correct returns if PCC is enabled." into udc-dev am: 39928511 am: bced26aa am: ace5e56d" into udc-qpr-dev-plus-aosp am: beb99d55

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



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