Merge "Remove EXTRA_USERID from NFC CardEmulation" am: 1a11b7b5d5 am: f5d51cb655 am: 37e2084dce

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

Change-Id: I34632e1f8ba0d71f36dd10dfef95c8fa6dc89fc2