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

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

Change-Id: I258557b8b668ced529a69203fe589570feaf0de4