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

[automerger skipped] Merge "Fix the empty selection issue when onCreateActionMode returns false" am: 78abed41 am: e6831592 am: df920724 -s ours

am skip reason: Merged-In I793f76a23978cbbbbde2d16e8a522615174bcdd5 with SHA-1 11bd6448 is already in history

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

Change-Id: Ia5ec8466b900c1fb1085768007156695259ac2a0