Merge "InputManagerService: Do not remove input channel when disposing monitor" into sc-dev am: 2f13cca5a6 am: edf4d6c9f3

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

Change-Id: Ie3779cfd4a9626046048880398f7620397eb7ee5