Merge "Fix isPrimary bit not being set" into udc-qpr-dev am: aec6d9da48

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

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