[automerger skipped] Merge "[DO NOT MERGE] [Companion] Call notifyDataSetChanged on main thread" into pi-dev am: bb35e9e0e9
am: 52489dbf66  -s ours

Change-Id: Ib1f5d58b561ce7507540dea2f50ee143a4d2eb6c