Merge "Merge "Allow for activities to resumed if keyguard is occluded." into...
Merge "Merge "Allow for activities to resumed if keyguard is occluded." into pi-dev am: fe478ff7" into pi-dev-plus-aosp
am: 905cf297
Change-Id: I244c68c86ed47e92113190265370837fe94e6523