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

Change-Id: I4d2f9058da7dfec5197edb6f7e25ed2d889ff756