Merge "Fix CDM.requestNotificationAccess() in profile." am: ca576d4b3b am: 2a59e10d69

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

Change-Id: I97e8bc22abece60aca575e63c2aa688f4035b64a