Merge ""Block notifications screen off" setting is used" into oc-dr1-dev am: dc7b2bc5e3
am: b099455971

Change-Id: I91ec657bd39e9be2466ed31c7174ec4ec3a43e93