Merge "Implement API council feedback for dismissKeyguard" into oc-dev am: 560324cfa0
am: 74b6192f8b

Change-Id: I9238bfa834a71830b6361874524105973dc55fb6