Fix for CalledFromWrongThreadException in updating UI and NetworkOnMainThreadException

Bug: 260916309
Test: manual

Change-Id: I845a08b85a2e8ab8495d204054988a987c82708a
2 files changed