Merge "SurfaceFlinger: do not assert if setActiveConfigWithConstraints fails"...
Merge "SurfaceFlinger: do not assert if setActiveConfigWithConstraints fails" into rvc-dev am: abb891a7 am: 6e921da2 am: 011f571f
Change-Id: I7d6ee8f433c896d340c406f83f548b744a72fd00