Merge "Sync action entry selection behavior with credential entry" into udc-dev am: 51aa1772

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



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