[automerger skipped] Merge "Fix isPrimary bit not being set" into udc-qpr-dev...

[automerger skipped] Merge "Fix isPrimary bit not being set" into udc-qpr-dev am: aec6d9da am: f65bda57 -s ours

am skip reason: Merged-In I230fe6e22fd441e7fb986e899a8cade38f9e3b36 with SHA-1 8b2acc71 is already in history

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



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