Merge "Fix missing showWhenLocked activity attribute" am: f1e9db0cbe
am: cfbbe2d89d

Change-Id: I93f86f0da6a557065a83044fcd77eb31eda8ce29