Merge "Prevent Telecom from holding focus indefinitely" am: cf8ff32bea

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/1682350

Change-Id: Ie2507216a949d2e7d2223868bb0ad1aa2e5cce93