Merge "Disable overflow menu on lock screen." into rvc-dev am: 126b567a6e

Change-Id: Ia77118a459af3bbbe0412eee95885a1a4e2766db