Merge changes from topic "pc-return-val" into udc-dev am: ffe3d223

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



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