Merge "Fix BP implicit flow failure" into udc-qpr-dev am: 542f1376 am: 54b6be2d

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



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