Merge "Fix an off-by-one bug in EditableInputConnection#endBatchEdit() return value" am: e908851af5

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

Change-Id: Ib201dd44251497cc10c89f5010f9aa4eb4c846d3