Restricting merge due to conflicts; will manually CP this to master. Bug: 276432652 Test: ForceEnableNotesRolePreferenceControllerTest Change-Id: Ic0fa7f33dcb6509908008774c725eec386d0608b
Restricting merge due to conflicts; will manually CP this to master. Bug: 276432652 Test: ForceEnableNotesRolePreferenceControllerTest Change-Id: Ic0fa7f33dcb6509908008774c725eec386d0608b