[automerger skipped] Merge "Run SubscriptionInfoUpdater on main thread." am: 23b5f9fd -s ours
am: 2ac595e5 -s ours
am skip reason: change_id I7d819d50f568561e0dff6250da61b8f157b315ca with SHA1 4e3372b3 is in history
Change-Id: I82a992d072465476be576a93d7025f5cb4e6c669