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 am: 39e2c809
Change-Id: Ic6fbaa36c9e89f008f92ad67e83f4dcd5b6a2fb9