Merge "Fix bluetooth tethering on multi-user" am: 4bb4c1a792 am: 1a0ac241e8
am: b077c11c2f

Change-Id: I21169bd77683c2f991f0ad1ab76e94b3e871a565