[automerger skipped] Merge "Don't flash system bars while showing an immersive...
[automerger skipped] Merge "Don't flash system bars while showing an immersive app on lockscreen" into pi-dev am: 11768fd8
am: 85418878 -s ours
Change-Id: Ic578f2a98b8d7d6a0167a68cb283c11b705f4622