Merge "Don't flash system bars while showing an immersive app on lockscreen" into pi-dev
am: 11768fd80f

Change-Id: Ia6a5c56e2603c6e6fe06e7da1dd7dcade3465cd0