Merge "Pass profile userId to notifyLockedProfile" into udc-dev am: 7e005c88 am: 5a392809 am: 988df9f8

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



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