Merge "Remove FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT in tethering" am: 2bc689c178 am: cb3d93d558

Change-Id: I22067ead6a81c71fe32c9018462bd64f9119079d