[automerger skipped] Merge "Fix an off-by-one bug in...

[automerger skipped] Merge "Fix an off-by-one bug in EditableInputConnection#endBatchEdit() return value" am: e908851a am: 0c024d11 am: d9c2da81 am: 9e9eb416 -s ours

am skip reason: Merged-In Ibc40072fa11a4d6e3c24b8d7860c914ccdbcbc8a with SHA-1 beda2b7f is already in history

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

Change-Id: I9377ee1077e1f8ef1f07223a505be5bd0afd6429