[automerger skipped] Merge "Fix getSelectionModeForCategory" into sc-dev am:...

[automerger skipped] Merge "Fix getSelectionModeForCategory" into sc-dev am: 9cf0e7bb am: 79b0d29a -s ours

am skip reason: Merged-In I0a09c9763d39c8e0b9b28df85603bdc7f281669d with SHA-1 b039c1fa is already in history

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

Change-Id: I8fdc5af063b8b17d423e47c9b2086ad40995be5f