Merge tag 'android-security-15.0.0_r7' into staging/lineage-22.1_android-security-15.0.0_r7

Android security 15.0.0 release 7

* tag 'android-security-15.0.0_r7':
  Fix the input info missing for SurfaceView
  Include color layers in input list to fix tapjacking vulnerability

Conflicts:
	services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp
	services/surfaceflinger/FrontEnd/RequestedLayerState.cpp
	services/surfaceflinger/FrontEnd/RequestedLayerState.h
	services/surfaceflinger/tests/unittests/LayerLifecycleManagerTest.cpp
	services/surfaceflinger/tests/unittests/LayerSnapshotTest.cpp

Change-Id: I268744759c6d8b3bb8f43e52738980e185708616