[automerger skipped] Merge "Fix the empty selection issue when...

[automerger skipped] Merge "Fix the empty selection issue when onCreateActionMode returns false" into sc-v2-dev am: acbbf43c -s ours am: ee901b76 -s ours

am skip reason: Merged-In I793f76a23978cbbbbde2d16e8a522615174bcdd5 with SHA-1 5593099f is already in history

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

Change-Id: I49671981576dd0646a525724dd14b366b6f9cf94