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

Change-Id: I24be143b38bdda59b4cc3037e495f0cb268a2b9f