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

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

Change-Id: I6753cdf390fffea4e3f4cb64e0088a5855fa8a49