Merge "Check iface by TextUtils.equals" am: 3fb0bce788 am: df3676db1f

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

Change-Id: I41201f59d771ea2415f49fcd3f7b9484785522b7