Merge "SurfaceFlinger: do not assert if setActiveConfigWithConstraints fails"...
Merge "SurfaceFlinger: do not assert if setActiveConfigWithConstraints fails" into rvc-dev am: abb891a7 am: 6e921da2 am: 5fea2a31 am: cd13abbc
Change-Id: I80f082734b7dab8d42ec8d2cdfe1b0ce8d6bd0a5