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
Change-Id: I84da9ce435f894fbff3e3175a68eec5157e1b205