Merge "[mainline] Decouple ServiceState.bitmaskHasTech and getBitmaskForTech"