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

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

Change-Id: Ia308f213ce30167f18d93dd5b66f55234bc90698