Merge "Remove dynamic summaries for "Screen lock"" into pi-dev
am: 27b8c6103f

Change-Id: Ia92d5f54874e9cd1de5060c8bd11b30b4a1947ce