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

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

Change-Id: Ic8427ec89e2316862c1e69d0309ae68887043ae1