Merge "Fix bug #5198365 android.widget.cts.TextViewTest#testGetFocusedRect fails on IRK49E mysid-userdebug"