Merge "cameraserver: Fix SessionConfigurationUtils::getAppropriateModeTag" into sc-dev am: 53a5891140 am: 88b5dc3d21

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

Change-Id: Ic559d800a162b4a85bd912ecd7423f61286da5d9