Merge "SF: fix a crash in SurfaceFlinger::setActiveModeInternal" into sc-v2-dev am: 329ed55a38 am: 16dfec1f3e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15302010

Change-Id: I7427a06da93f647f5bbeab13c1beb4fd2d3ed542