Merge "Fix missing showWhenLocked activity attribute"
am: f1e9db0cbe

Change-Id: If921e3c02dc5c3604f4c67c77666f85cefd69846