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