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

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

Change-Id: Ibe79b6657a607d94524dd2e1959668ad762a5e63