Merge "Merge "Make 'no notifications' work like 'manage/history'" into rvc-dev...
Merge "Merge "Make 'no notifications' work like 'manage/history'" into rvc-dev am: 458dee83 am: e0c7fd3e" into rvc-d1-dev-plus-aosp am: 0e26657e
Change-Id: I5e77239da09278739d53bd3260cedfdce173e13c