Merge "cameraserver: Fix SessionConfigurationUtils::getAppropriateModeTag" into sc-dev am: 53a58911 am: 88b5dc3d am: 186f6f5a

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

Change-Id: I08973e8d58a3c24fe67319a7bfb0d64a33fe429b