Merge "SurfaceFlinger: do not assert if setActiveConfigWithConstraints fails"...
Merge "SurfaceFlinger: do not assert if setActiveConfigWithConstraints fails" into rvc-dev am: abb891a7 am: c7b2ea04 am: 4423c70a
Change-Id: I2db5c7e5de4581e0336eae75fc2af85ccbcda701